From: kfraser@localhost.localdomain Date: Wed, 2 Aug 2006 14:00:39 +0000 (+0100) Subject: [TOOLS] Enhance xenstore-ls to optionally display permissions. X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~15754^2~6 X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/%22bookmarks://%22Dat/%22http:/www.example.com/cgi/%22https:/%22bookmarks:/%22Dat?a=commitdiff_plain;h=ae9516f06f34e61ce00e0fac5d5fc101ef6c1a57;p=xen.git [TOOLS] Enhance xenstore-ls to optionally display permissions. Also perform an ioctl to determine the current width of the terminal. Signed-off-by: Michael LeMay --- diff --git a/tools/xenstore/xsls.c b/tools/xenstore/xsls.c index 7f3fa4f7f1..4d3b1aa1af 100644 --- a/tools/xenstore/xsls.c +++ b/tools/xenstore/xsls.c @@ -3,8 +3,19 @@ #include #include #include +#include +#include +#include -void print_dir(struct xs_handle *h, char *path, int cur_depth) +static int max_width = 80; +static int desired_width = 60; + +#define TAG " = \"...\"" +#define TAG_LEN strlen(TAG) + +#define MIN(a, b) (((a) < (b))? (a) : (b)) + +void print_dir(struct xs_handle *h, char *path, int cur_depth, int show_perms) { char **e; char newpath[512], *val; @@ -16,33 +27,103 @@ void print_dir(struct xs_handle *h, char *path, int cur_depth) err(1, "xs_directory (%s)", path); for (i = 0; i (151 - strlen(e[i]))) - printf(" = \"%.*s...\"\n", (int)(148 - strlen(e[i])), val); - else - printf(" = \"%s\"\n", val); + } + else { + if (max_width < (linewid + len + TAG_LEN)) { + printf(" = \"%.*s...\"", + (int)(max_width - TAG_LEN - linewid), val); + } + else { + linewid += printf(" = \"%s\"", val); + if (show_perms) { + putchar(' '); + for (linewid++; + linewid < MIN(desired_width, max_width); + linewid++) + putchar((linewid & 1)? '.' : ' '); + } + } + } free(val); - print_dir(h, newpath, cur_depth+1); + + if (show_perms) { + perms = xs_get_permissions(h, XBT_NULL, newpath, &nperms); + if (perms == NULL) { + warn("\ncould not access permissions for %s", e[i]); + } + else { + int i; + fputs(" (", stdout); + for (i = 0; i < nperms; i++) { + if (i) + putchar(','); + xs_perm_to_string(perms+i, buf); + fputs(buf, stdout); + } + putchar(')'); + } + } + + putchar('\n'); + + print_dir(h, newpath, cur_depth+1, show_perms); } free(e); } +void usage(int argc, char *argv[]) +{ + fprintf(stderr, "Usage: %s [-p] [path]\n", argv[0]); +} + int main(int argc, char *argv[]) { + struct winsize ws; + int ret; + int c; + int show_perm = 0; + struct xs_handle *xsh = xs_daemon_open(); if (xsh == NULL) err(1, "xs_daemon_open"); - print_dir(xsh, argc == 1 ? "/" : argv[1], 0); +#define PAD 2 + + memset(&ws, 0, sizeof(ws)); + ret = ioctl(STDOUT_FILENO, TIOCGWINSZ, &ws); + if (!ret) + max_width = ws.ws_col - PAD; + + while (0 < (c = getopt(argc, argv, "p"))) { + switch (c) { + case 'p': + show_perm = 1; + max_width -= 16; + break; + case ':': + case '?': + default: + usage(argc, argv); + return 0; + } + } + + print_dir(xsh, (argc - optind) == 1 ? argv[optind] : "/", 0, show_perm); return 0; }